Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

thephpleague:9.0.0-WIP -> skroczek:wip/private-claims Upstream merge and conflict resolve #1

Merged
merged 183 commits into from
Sep 26, 2023

Conversation

JRogaishio
Copy link

Merged thephpleague:9.0.0-WIP into skroczek:wip/private-claims and resolved merge conflicts. Two unit tests were added to tests/Grant/RefreshTokenGrantTest.php that appear to be failing on the upstream side. Otherwise all other phpunit tests are passing.

This PR is to bring the original PR (below) up to date so it can be merged into the main repo.
thephpleague#1122

ssigwart and others added 28 commits July 10, 2021 09:39
Use key as string without a temporary file
`(?:\s+)?` is just `\s*` but harder
docs(AuthorizationServer): fix a typo in a comment
Avoid using broken `LocalFileReference` from lcobucci/jwt
Use thephpleague/oauth2-server-bundle for the Symfony integration
@skroczek skroczek merged commit 2ea4450 into skroczek:wip/private-claims Sep 26, 2023
@JRogaishio JRogaishio deleted the wip/private-claims branch December 1, 2023 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.